rabin 2 semanas atrás
pai
commit
79fc578dcb

+ 4 - 2
src/place/interface/app/Api/Main.php

@@ -89,7 +89,7 @@ class Main extends Core
         $pwd = Dever::input('pwd');
         if (!$pwd) {
             $code = Dever::input('code', 'is_numeric', '验证码');
-            //Dever::load(\Msg\Lib\Template::class)->check('reg_code', $mobile, $code);
+            Dever::load(\Msg\Lib\Template::class)->check('reg_code', $mobile, $code);
         }
         $invite = Dever::input('invite');
         $db = Dever::db('puser/info');
@@ -107,7 +107,7 @@ class Main extends Core
             if ($user['type'] == 1) {
                 Dever::load(\Prole\Lib\Info::class)->up($uid, $user['sales_type'], $user['sales_id']);
             }
-        } else {
+        } elseif (!$pwd) {
             $action = '注册';
             if ($invite) {
                 $parent_uid = Dever::load(\Invite\Lib\Code::class)->getUid($invite);
@@ -127,6 +127,8 @@ class Main extends Core
                 }*/
             }
             $uid = Dever::load(\Puser\Lib\Info::class)->createUser($mobile, $this->place->info['sales_type'], $this->place->info['sales_id'], $parent_uid);
+        } else {
+            Dever::error('账户不存在,请切换到验证码登录');
         }
         return $this->result($uid);
     }

+ 2 - 2
src/place/order/app/Lib/Pay.php

@@ -273,9 +273,9 @@ class Pay
         if ($this->order['pay_money_cash'] > 0) {
             $result['pay'] = Dever::load(\Place\Lib\Account::class)->pay($this->order);
             if (isset($result['pay']['link']) && $result['pay']['link']) {
-                //return $result;
+                return $result;
             }
-            $result['pay'] = true;
+            //$result['pay'] = true;
         } else {
             $result['pay'] = true;
         }