diff --git a/application/index/controller/Member.php b/application/index/controller/Member.php index e948e352..f8f09ed4 100644 --- a/application/index/controller/Member.php +++ b/application/index/controller/Member.php @@ -82,13 +82,36 @@ class Member extends Controller{ $this->userObj->getMemory(); } + public function SignUp(){ + $this->userObj = new User(cookie('user_id'),cookie('login_key')); + $this->isLoginStatusCheck(); + return view('login', [ + 'options' => Option::getValues(['basic'],$this->userObj->userSQLData), + 'RegOptions' => Option::getValues(['register','login']), + 'loginStatus' => $this->userObj->loginStatus, + 'pageId' => "register", + ]); + } + + public function FindPwd(){ + $this->userObj = new User(cookie('user_id'),cookie('login_key')); + $this->isLoginStatusCheck(); + return view('login', [ + 'options' => Option::getValues(['basic'],$this->userObj->userSQLData), + 'RegOptions' => Option::getValues(['register','login']), + 'loginStatus' => $this->userObj->loginStatus, + 'pageId' => "resetPwd", + ]); + } + public function LoginForm(){ $this->userObj = new User(cookie('user_id'),cookie('login_key')); $this->isLoginStatusCheck(); return view('login', [ - 'options' => Option::getValues(['basic']), + 'options' => Option::getValues(['basic'],$this->userObj->userSQLData), 'RegOptions' => Option::getValues(['register','login']), 'loginStatus' => $this->userObj->loginStatus, + 'pageId' => "login", ]); } @@ -114,10 +137,11 @@ class Member extends Controller{ public function TwoStep(){ $this->userObj = new User(cookie('user_id'),cookie('login_key')); $this->isLoginStatusCheck(); - return view('two_step', [ - 'options' => Option::getValues(['basic']), + return view('login', [ + 'options' => Option::getValues(['basic'],$this->userObj->userSQLData), 'RegOptions' => Option::getValues(['register','login']), 'loginStatus' => $this->userObj->loginStatus, + 'pageId' => "TwoStep", ]); } @@ -133,14 +157,16 @@ class Member extends Controller{ public function emailActivate(){ $activationKey = input('param.key'); - $basicOptions = Option::getValues(['basic']); $this->userObj = new User(cookie('user_id'),cookie('login_key')); $this->isLoginStatusCheck(); + $basicOptions = Option::getValues(['basic','register','login'],$this->userObj->userSQLData); $activeAction = User::activicateUser($activationKey); if($activeAction[0]){ - return view('active_user', [ + return view('login', [ 'options' => $basicOptions, + 'RegOptions' => $basicOptions, 'loginStatus' => $this->userObj->loginStatus, + 'pageId' => "emailActivate", ]); }else{ $this->error($activeAction[1],403,$basicOptions); @@ -150,15 +176,17 @@ class Member extends Controller{ public function resetPwd(){ $resetKey = input('param.key'); $userId = input('get.uid'); - $basicOptions = Option::getValues(['basic']); $this->userObj = new User(cookie('user_id'),cookie('login_key')); + $basicOptions = Option::getValues(['basic','register','login'],$this->userObj->userSQLData); $this->isLoginStatusCheck(); $resetAction = User::resetUser($resetKey,$userId); if($resetAction[0]){ - return view('reset_user', [ + return view('login', [ 'options' => $basicOptions, + 'RegOptions' => $basicOptions, 'loginStatus' => $this->userObj->loginStatus, 'key' => $resetKey."_".$userId, + 'pageId' => "resetPwdForm", ]); }else{ $this->error($resetAction[1],403,$basicOptions); diff --git a/application/index/view/member/active_user.html b/application/index/view/member/active_user.html deleted file mode 100644 index 63166134..00000000 --- a/application/index/view/member/active_user.html +++ /dev/null @@ -1,59 +0,0 @@ -{extend name="header_public" /} -{block name="title"}注册成功- {$options.siteName}{/block} -{block name="content"} - - - - - - - - -