sandm пре 1 година
родитељ
комит
d3030d2454

+ 4 - 4
app/Http/Controllers/Mobile/Auth/LoginController.php

@@ -206,7 +206,7 @@ class LoginController extends MobileBaseController
     public function loginMZT(){
         if(request()->isMethod('POST')){
             $params = request()->post();
-            $member      = Member::where('mobile', '=', $params['userMobile'])->orderBy('id', 'desc')->first();
+            $member      = Member::where('mobile', '=', $params['user_mobile'])->orderBy('id', 'desc')->first();
             if ($member) {
                 //登录
                 $this->authService->login($member, 1);
@@ -215,14 +215,14 @@ class LoginController extends MobileBaseController
                 // 注册
                 $member           = $registerService->registerPerson([
                     'reg_type'      => 1,
-                    'mobile'        => $params['userMobile'],
+                    'mobile'        => $params['user_mobile'],
                     'password'      => '000000',
                     'utype'         => 2,
                     'reg_source'    => 2,
                     'member_status' => 0,
                 ]);
-                $member->email    = empty($params['userEmail']) ? '' : $params['userEmail'];
-                $member->username = $params['userName'];
+                $member->email    = empty($params['user_email']) ? '' : $params['user_email'];
+                $member->username = $params['user_name'];
                 $member->save();
                 $this->authService->login($member, 1);
             }

+ 38 - 23
public/themes/default/views/mobile/app/auth/mzt.blade.php

@@ -5,7 +5,6 @@
 @endpush
 
 @push('css')
-    <link href="{{ theme_asset('mobile/css/members.css') }}" rel="stylesheet">
     <style>
         .output{
             display: flex;
@@ -20,6 +19,11 @@
 @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')
@@ -31,27 +35,14 @@
 
 @section('script')
     <script>
-        var realConsoleLog = console.log;
-        console.log = function () {
-            var message = [].join.call(arguments, " ");
-            // Display the message somewhere... (jQuery example)
-            $(".output").text(message);
-            realConsoleLog.apply(console, arguments);
-        };
+
         app.page.onLoad = function () {
-            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){
+
+            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;
@@ -61,8 +52,32 @@
                 });
 
             }, function(result) {
-                alert(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>