dever 6 years ago
parent
commit
bb38b118cd
2 changed files with 25 additions and 10 deletions
  1. 5 4
      src/App.php
  2. 20 6
      src/Reg.php

+ 5 - 4
src/App.php

@@ -112,19 +112,20 @@ class App extends Base
     public function login()
     {
     	$mobile = Dever::input('mobile');
-    	$code = Dever::input('code');
+    	$code = Dever::input('mcode');
         $system = Dever::input('system', 1);
     	$source_type = Dever::input('source_type', 'applet');
-    	$send['skin'] = 'code';
-    	$send['mobile'] = $mobile;
-    	$send['code'] = $code;
 
         # 添加测试账号
+        /*
         if ($mobile) {
 
         } else {
         	$mobile = Dever::load('passport/reg')->checkMobileExists();
         }
+        */
+
+        $mobile = Dever::load('passport/reg')->checkMobileExists(false, -1);
     	
 
         $uid = false;

+ 20 - 6
src/Reg.php

@@ -18,12 +18,12 @@ class Reg extends Base
     }
 
     /**
-     * 获取手机随机验证码:未登录
+     * 获取手机随机验证码
      * @return mixed
      */
     public function getMCode()
     {
-        $mobile = $this->checkMobileExists(1);
+        $mobile = $this->checkMobileExists(1, -1);
 
         $msg = $this->getMcode_action($mobile);
         return $msg;
@@ -40,6 +40,18 @@ class Reg extends Base
         return $msg;
     }
 
+    /**
+     * 获取手机随机验证码:未登录
+     * @return mixed
+     */
+    public function getMCodeReg()
+    {
+        $mobile = $this->checkMobileExists(1);
+
+        $msg = $this->getMcode_action($mobile);
+        return $msg;
+    }
+
     /**
      * 获取手机随机验证码:已经登录状态
      * @return mixed
@@ -125,10 +137,12 @@ class Reg extends Base
 
         $user = Dever::load('passport/user-one', $param);
 
-        if ($login == false && $user) {
-            Dever::alert('该手机号已经注册');
-        } elseif ($login == true && !$user) {
-            Dever::alert('该手机号未注册');
+        if ($login != -1) {
+            if ($login == false && $user) {
+                Dever::alert('该手机号已经注册');
+            } elseif ($login == true && !$user) {
+                Dever::alert('该手机号未注册');
+            }
         }
 
         return $param['option_mobile'];