From 06f69a2724cf6d9c518a1124a77dc867fc2006cd Mon Sep 17 00:00:00 2001
From: 潘浩文 <phw@bronet.cn>
Date: Fri, 19 Oct 2018 10:29:25 +0800
Subject: [PATCH] 1
---
MP_verify_4m36yQ6Bb4ZbSzL9.txt | 1 +
app/user/controller/RegisterController.php | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
create mode 100644 MP_verify_4m36yQ6Bb4ZbSzL9.txt
diff --git a/MP_verify_4m36yQ6Bb4ZbSzL9.txt b/MP_verify_4m36yQ6Bb4ZbSzL9.txt
new file mode 100644
index 0000000..7ef728f
--- /dev/null
+++ b/MP_verify_4m36yQ6Bb4ZbSzL9.txt
@@ -0,0 +1 @@
+4m36yQ6Bb4ZbSzL9
\ No newline at end of file
diff --git a/app/user/controller/RegisterController.php b/app/user/controller/RegisterController.php
index 8036b3d..9f6af61 100644
--- a/app/user/controller/RegisterController.php
+++ b/app/user/controller/RegisterController.php
@@ -13,6 +13,7 @@ namespace app\user\controller;
use app\portal\service\MobileService;
use cmf\controller\HomeBaseController;
use cmf\controller\WeChatBaseController;
+use think\db;
use think\Validate;
use app\user\model\UserModel;
@@ -23,7 +24,6 @@ class RegisterController extends WeChatBaseController
{
parent::_initialize();
$this->checkWeChatUserLogin();
- $this->checkUser();
}
/**
* 前台用户注册
@@ -58,7 +58,7 @@ class RegisterController extends WeChatBaseController
$param = $this->request->param();
$result = cmf_check_verification_code($param['mobile'], $param['code'], true);
if ($result == '') {
- $re = Db::name('users')->where([ 'mobile' => $param['mobile'], 'open_id' => session('user')['id']])->find();
+ $re = Db::name('users')->whereOr([ 'mobile' => $param['mobile'], 'open_id' => session('user')['id']])->find();
if ($re) {
//用户重复
return '该用户已注册';
--
libgit2 0.24.0