1

application/user/controller/Login.php

@@ -21,11 +21,6 @@ class Login extends Controller
      */
     public function index()
     {
-//        $http = array();
-//        if(!empty($_SERVER['HTTP_REFERER'])){
-            $http = $_SERVER['HTTP_REFERER'];
-        //}
-
         if (session('user_id')) {
             $this->success('已经登录', 'User/Index/index');
         }
@@ -34,6 +29,7 @@ class Login extends Controller
             $user_email = input('post.user_email');
             $user_password = input('post.user_password');
 //            $captcha = input('post.captcha');
+            $http = input('post.http');
 
             $data = array(
                 'user_email' => $user_email,
@@ -75,18 +71,19 @@ class Login extends Controller
                 session('user_id', $user_info['user_id']);
                 session('user_email', $user_info['user_email']);
 
-//                if(!empty($http)){
-//                    //return $this->redirect('Home/Product/product');
-//                    header("location:$http");
-//                }else{
-//                    return $this->redirect('User/Index/index');
-//                }
-                return $this->redirect('User/Index/index');
+                if(!empty($http)){
+                    header("location:$http");
+                }else{
+                    return $this->redirect('User/Index/index');
+                }
             } else {
                 $this->success('帐号密码错误');
             }
         } else {
-            //$this->assign('http', $http);
+            if(!empty($_SERVER['HTTP_REFERER'])){
+                $http = $_SERVER['HTTP_REFERER'];
+                $this->assign('http', $http);
+            }
             return $this->fetch();
         }
     }

application/user/controller/Register.php

@@ -44,6 +44,8 @@ class Register extends Controller
             $ch_box = input('post.ch_box');
             $user_type = input('post.user_type');
 
+            $http = input('post.http');
+
             // 用户类型 校验
             if (empty($user_type)) {
                 //验证失败
@@ -111,9 +113,17 @@ class Register extends Controller
                 session('user_id', $id);
                 session('user_email', $user_info['user_email']);
 
-                return $this->redirect('User/Index/index');
+                if(!empty($http)){
+                    header("location:$http");
+                }else{
+                    return $this->redirect('User/Index/index');
+                }
             }
         } else {
+            if(!empty($_SERVER['HTTP_REFERER'])){
+                $http = $_SERVER['HTTP_REFERER'];
+                $this->assign('http', $http);
+            }
             return $this->fetch();
         }
     }

application/user/view/login/index.html

@@ -60,7 +60,10 @@
                     <input type="text" name="user_email" placeholder="{:lang('user_email')}" required class="text">
                 </div>
                 <div class="form-group">
-                    <input type="password" name="user_password" placeholder="{:lang('user_password')}" required class="text">
+                    <input type="text" name="user_password" placeholder="{:lang('user_password')}" required class="text">
+                </div>
+                <div class="form-group">
+                    <input type="text" style="display: none;" name="http" placeholder="{:lang('http')}" required class="text" value="{$http}">
                 </div>
                 <!--<div class="form-group">-->
                     <!--<input type="text" name="captcha" placeholder="{:lang('login_captcha')}" required class="text" style="width:60%;float:left;">-->

application/user/view/register/index.html

@@ -111,6 +111,9 @@
                     <input type="text" name="captcha" placeholder="{:lang('login_captcha')}" required class="text" style="width:64%;float:left;">
                     <img src="{:captcha_src()}" style="width:30%;height:38px;" id="change_captcha"/>
                 </div>
+                <div class="form-group">
+                    <input type="text" style="display: none;" name="http" placeholder="{:lang('http')}" required class="text" value="{$http}">
+                </div>
                 <!--<input type="checkbox" name="ch_box" id="ch_box" onclick="c_box()" />我已阅读并同意<a>《用户协议》</a>及<a>《法律声明及隐私条款》</a><br><br>-->
                 <div class="form-group" style="text-align: center;margin-top: 60px;">
                     <input type="submit" class="layui-btn" id="layui-btn" value="{:lang('register_sumbit')}" lay-submit lay-filter="login" style="margin-top:-20px;width:100%; "/>