Browse Source

no message

Tree 3 tuần trước cách đây
mục cha
commit
f240bbcddb

+ 1 - 1
app/Game/Services/AgentService.php

@@ -185,7 +185,7 @@ class AgentService
         }
         $h5link = env('H5_LINK', 'https://www.usslot777.com/');
         if($ActName=='WheelFree100') {
-            $link = $h5link .'#/cashwheel?act='. self::encodeAct($GlobalUID, $ActName);
+            $link = $h5link .'?act='. self::encodeAct($GlobalUID, $ActName);
         }else{
             $link = $h5link .'act='.self::encodeAct($GlobalUID, $ActName);
         }

+ 17 - 11
app/Http/Controllers/Game/LoginController.php

@@ -128,18 +128,7 @@ class LoginController extends Controller
         }
 
 
-        // 查看手机号是否已经绑定
-        $first = DB::connection('write')->table('QPAccountsDB.dbo.AccountPhone')
-            ->where('PhoneNum', $Phone)
-//            ->where('Channel', $user->Channel)
-            ->orWhere('UserID', $user->UserID)
-            ->first();
 
-        if ($first) {
-            SetNXLock::release($redisKey);
-            Log::info('web.verify.already_bound',[$Phone,$PhoneCode]);
-            return apiReturnFail(['web.verify.already_bound', 'O número de telefone foi vinculado']); // 电话号码已绑定
-        }
 
         if (!is_numeric($PhoneCode)) {
             SetNXLock::release($redisKey);
@@ -156,6 +145,21 @@ class LoginController extends Controller
             return apiReturnFail(['web.verify.code_incorrect_or_expired', 'O código está incorreto ou o tempo passou']);
         }
 
+
+        // 查看手机号是否已经绑定
+        $first = DB::connection('write')->table('QPAccountsDB.dbo.AccountPhone')
+            ->where('PhoneNum', $Phone)
+//            ->where('Channel', $user->Channel)
+            ->orWhere('UserID', $user->UserID)
+            ->first();
+
+        if ($first) {
+            SetNXLock::release($redisKey);
+            Log::info('web.verify.already_bound',[$Phone,$PhoneCode]);
+//            return apiReturnFail(['web.verify.already_bound', 'O número de telefone foi vinculado']); // 电话号码已绑定
+            return apiReturnFail(['web.verify.already_bound', 'O número de telefone foi vinculado'],GlobalUserInfo::getGameUserInfoToWeb('UserID',$first->UserID)); // 电话号码已绑定
+        }
+
 //        if (!isset($request->password) || !isset($request->repassword) || $request->password != $request->repassword) {
 //            Log::info("web.reg.password_notsame",[$Phone,$PhoneCode]);
 //            return apiReturnFail(['web.reg.password_notsame', 'As senhas digitadas duas vezes são inconsistentes, digite novamente!'], '', 2);
@@ -171,6 +175,8 @@ class LoginController extends Controller
         }
 
 
+
+
         $UserID = $user->UserID;
         $BindDate = Carbon::now()->toDateTimeString();
         $LogonPass = $request->password??$PhoneCode;

+ 1 - 0
app/Http/Controllers/Game/SendCodeController.php

@@ -41,6 +41,7 @@ class SendCodeController
         }
 
         $Type = $request->Type ?: 0;    // 标识 1找回密码
+        $Type = 2;
         $ip = $request->ip();
 
 

+ 1 - 1
resources/views/admin/custom/userall.blade.php

@@ -130,7 +130,7 @@
                                         <td>
                                             {{$item->PhoneNum}}
                                             <a  target="_blank"
-                                                href="https://api.whatsapp.com/send?phone=55{{$item->PhoneNum}}">what's app</a>
+                                                href="https://api.whatsapp.com/send?phone={{$item->PhoneNum}}">what's app</a>
                                         </td>
                                         <td>{{$item->Email}}</td>
                                         <td>{{ $item->Score }}</td>

+ 1 - 1
resources/views/admin/custom/usernew.blade.php

@@ -107,7 +107,7 @@
                                         <td>
                                             {{$item->PhoneNum}}
                                             <a  target="_blank"
-                                                href="https://api.whatsapp.com/send?phone=55{{$item->PhoneNum}}">what's app</a>
+                                                href="https://api.whatsapp.com/send?phone={{$item->PhoneNum}}">what's app</a>
                                         </td>
                                         <td>{{$item->Email}}</td>
                                         <td>{{ $item->Score }}</td>

+ 1 - 1
resources/views/admin/global/id_list.blade.php

@@ -93,7 +93,7 @@
                             <tr>
                                 <td>{{ __('auto.手机号') }}</td>
                                 <td>{{$userInfo->phone}} <a  target="_blank"
-                                                            href="https://api.whatsapp.com/send?phone=55{{$userInfo->phone}}">what's app</a></td>
+                                                            href="https://api.whatsapp.com/send?phone={{$userInfo->phone}}">what's app</a></td>
                             </tr>
                             <tr>
                                 <td>{{ __('auto.上次离线时间') }}</td>

+ 1 - 1
resources/views/admin/recharge/list.blade.php

@@ -228,7 +228,7 @@
                                             </a>
                                             @if ($v->Phone )
                                                 <a  target="_blank"
-                                                    href="https://api.whatsapp.com/send?phone=55{{$v->Phone}}">what's app</a>
+                                                    href="https://api.whatsapp.com/send?phone={{$v->Phone}}">what's app</a>
                                             @endif
                                         </td>