用户登录

app/Common/Token.php

@@ -103,6 +103,6 @@ class Token
             'expired_at' => $expired_at
         ));
 		
-        return array('access_token'=>$token,'expired_at'=>$expired_at);
+        return array('access_token'=>$token,'expired_at'=>$expired_at,'uid'=>$uid,'type'=>$type);
     }
 }

app/Http/Controllers/Api/UserController.php

@@ -5,6 +5,7 @@ use App\Http\Controllers\Api\CommonController;
 use Illuminate\Http\Request;
 use App\Common\ReturnData;
 use App\Common\Token;
+use App\Common\Helper;
 use App\Http\Model\User;
 
 class UserController extends CommonController
@@ -86,133 +87,63 @@ class UserController extends CommonController
     }
     
     //注册
-    public function register(Request $request)
+    public function wxRegister(Request $request)
 	{
-        $mobile = $request->input('mobile', null);
-        $password = $request->input('password', null);
-		$community_id = $request->input('community_id', null);
-		$address = $request->input('address', null);
-		$type = $request->input('type', null);
-		$verificationCode = $request->input('verificationCode', null);
-        $verificationType = $request->input('verificationType', null); //7表示验证码登录
-		
-		$yezhu_mobile = $request->input('yezhu_mobile', null);
-		
-        Log::info("注册手机号==========mobile=======".$mobile);
+        $data['mobile'] = $request->input('mobile','');
+        $data['user_name'] = $request->input('user_name','');
+        $data['password'] = $request->input('password','');
         
-        if ($mobile==null || $password==null || $verificationCode==null || $verificationType===null || $community_id===null)
+        if (($data['mobile']=='' && $data['user_name']=='') || $data['password']=='')
 		{
-            return ReturnCode::create(ReturnCode::PARAMS_ERROR);
+            return ReturnData::create(ReturnData::PARAMS_ERROR);
         }
-		
-        if (!Helper::isValidMobile($mobile))
+        
+        if (isset($data['mobile']) && !Helper::isValidMobile($data['mobile']))
 		{
-            return response(ReturnCode::create(ReturnCode::MOBILE_FORMAT_FAIL));
+            return ReturnData::create(ReturnData::MOBILE_FORMAT_FAIL);
         }
 		
-		$verifyCode = VerifyCode::isVerify($mobile, $verificationCode, $verificationType);
-		if(!$verifyCode)
-		{
-			return ReturnCode::create(ReturnCode::INVALID_VERIFY_CODE);
-		}
-		
-		if($yezhu_mobile!=null)
-		{
-			$yezhu = MallDataManager::userFirst(['mobile'=>$yezhu_mobile,'community_id'=>$community_id]);
-			if (!$yezhu)
-			{
-				return response(ReturnCode::create(ReturnCode::PARAMS_ERROR,'业主不匹配'));
-			}
-		}
-		
 		//判断是否已经注册
-		$user = MallDataManager::userFirst(['mobile'=>$mobile]);
-		if ($user)
+		if (User::getOneUser(array('mobile'=>$data['mobile'])))
 		{
-			return response(ReturnCode::create(ReturnCode::MOBILE_EXIST));
+            return ReturnData::create(ReturnData::MOBILE_EXIST);
 		}
 		
-		try
+		if (User::getOneUser(array('user_name'=>$data['user_name'])))
 		{
-			DB::beginTransaction();
-			//创建用户
-			$userdata['mobile'] = $mobile;
-			$userdata['password'] = $password;
-			$userdata['verify_mobile'] = 1;
-			$userdata['name'] = $mobile;
-			$userdata['nickname'] = $mobile;
-			$userdata['community_id'] = $community_id;
-			$userdata['address'] = $address;
-			$userdata['type'] = $type;
-			$userid = DB::table('user')->insertGetId($userdata);
-			
-			//注册环信用户
-			$Easemob = new Easemob();
-			$Easemob->imRegister(['username'=>'cuobian'.$userid,'password'=>md5('cuobian'.$userid)]);
-			
-			//生成token
-			if ($user = MallDataManager::userFirst(['mobile'=>$mobile,'password'=>$password]))
-			{
-				//获取token
-				$expired_at = Carbon::now()->addDay()->toDateTimeString();
-				$token = Token::generate(Token::TYPE_SHOP, $user->id);
-			}
-			
-			DB::commit();
-			$response         = ReturnCode::create(ReturnCode::SUCCESS);
-			$response['data'] = [
-				'id' => $user->id,
-				'mobile' => $user->mobile,
-				'expired_at' => $expired_at,
-				'token' => $token,
-			];
+            return ReturnData::create(ReturnData::SUCCESS,null,'用户名已存在');
 		}
-		catch (Exception $e)
-		{
-			DB::rollBack();
-			Log::info($e->getMessage());
-			return response(ReturnCode::error($e->getCode(), $e->getMessage()));
-		}
-		
-		return response($response);
+        
+        //添加用户
+        $res = User::wxRegister($data);
+        
+        if($res == false)
+        {
+            return ReturnData::create(ReturnData::SYSTEM_FAIL);
+        }
+        
+        return ReturnData::create(ReturnData::SUCCESS,$res);
     }
 	
 	//登录
-    public function login(Request $request)
+    public function wxLogin(Request $request)
     {
-        $mobile = $request->input('mobile');
-        $password = $request->input('password');
-		
-        if (!$mobile || !$password)
-		{
-            return response(ReturnCode::create(ReturnCode::PARAMS_ERROR));
-        }
+        $data['user_name'] = $request->input('user_name','');
+        $data['password'] = $request->input('password','');
         
-        if ($user = MallDataManager::userFirst(['mobile'=>$mobile]))
+        if ($data['user_name']=='' || $data['password']=='')
 		{
-            //判断密码
-            if ($password == $user->password)
-			{
-                //获取token
-                $expired_at = Carbon::now()->addDay()->toDateTimeString();
-                $token = Token::generate(Token::TYPE_SHOP, $user->id);
-                
-                $response = ReturnCode::success();
-                $response['data']=[
-                    'id' => $user->id, 'name' => $user->name, 'nickname' => $user->nickname, 'headimg' => (string)$user->head_img, 'token' => $token, 'expired_at' => $expired_at, 'mobile' => $user->mobile, 'hx_name' => 'cuobian'.$user->id, 'hx_pwd' => md5('cuobian'.$user->id)
-                ];
-				
-                return response($response);
-            }
-			else
-			{
-                return response(ReturnCode::create(ReturnCode::PASSWORD_NOT_MATCH));
-            }
+            return ReturnData::create(ReturnData::PARAMS_ERROR);
         }
-		else
+        
+        $res = User::wxLogin($data);
+        
+        if ($res === false)
 		{
-            return response(ReturnCode::create(ReturnCode::USER_NOT_EXIST));
+            return ReturnData::create(ReturnData::PARAMS_ERROR,null,'账号或密码错误');
         }
+            
+        return ReturnData::create(ReturnData::SUCCESS,$res);
     }
     
     //验证码登录

app/Http/Controllers/Api/VerifyCodeController.php

@@ -16,7 +16,7 @@ class VerifyCodeController extends CommonController
     }
 	
     //验证码校验
-    public function check(Request $request)
+    public function verifyCodeCheck(Request $request)
     {
         $mobile = $request->input('mobile', null); //手机号码
         $verifyCode = $request->input('verifyCode', null); //手机验证码

app/Http/Controllers/Weixin/UserController.php

@@ -232,7 +232,71 @@ class UserController extends CommonController
             header('Location: '.route('weixin_user'));exit;
         }
         
-		return view('weixin.user.login');
+        if($_SERVER['REQUEST_METHOD'] == 'POST')
+        {
+            if($_POST['user_name'] == '')
+            {
+                $this->error_jump('账号不能为空');
+            }
+            
+            if($_POST['password'] == '')
+            {
+                $this->error_jump('密码不能为空');
+            }
+            
+            $postdata = array(
+                'user_name' => $_POST['user_name'],
+                'password' => md5($_POST['password'])
+            );
+            $url = env('APP_API_URL')."/wx_login";
+            $res = curl_request($url,$postdata,'POST');
+            
+            if($res['code'] != ReturnCode::SUCCESS_CODE){$this->error_jump('登录失败');}
+            
+            $_SESSION['weixin_user_info'] = $res['data'];
+            
+            header('Location: '.route('weixin_user'));exit;
+        }
+        
+        return view('weixin.user.login');
+	}
+    
+    //注册
+    public function register(Request $request)
+	{
+        if(isset($_SESSION['weixin_user_info']))
+        {
+            if(isset($_SERVER["HTTP_REFERER"])){header('Location: '.$_SERVER["HTTP_REFERER"]);exit;}
+            header('Location: '.route('weixin_user'));exit;
+        }
+        
+        if($_SERVER['REQUEST_METHOD'] == 'POST')
+        {
+            if($_POST['user_name'] == '')
+            {
+                $this->error_jump('账号不能为空');
+            }
+            
+            if($_POST['password'] == '')
+            {
+                $this->error_jump('密码不能为空');
+            }
+            
+            $postdata = array(
+                'user_name' => $_POST['user_name'],
+                'password' => md5($_POST['password'])
+            );
+            $url = env('APP_API_URL')."/wx_login";
+            $res = curl_request($url,$postdata,'POST');
+            
+            if($res['code'] != ReturnCode::SUCCESS_CODE){$this->error_jump('登录失败');}
+            
+            $_SESSION['weixin_user_info'] = $res['data'];
+            
+            header('Location: '.route('weixin_user'));exit;
+        }
+        
+        return view('weixin.user.register');
 	}
     
     public function logout(Request $request)

app/Http/Middleware/WxLogin.php

@@ -16,7 +16,7 @@ class WxLogin
 		}
 		else
 		{
-			header('Location: '.route('weixin'));exit;
+			header('Location: '.route('weixin_login'));exit;
 		}
 		
         return $next($request);

app/Http/Model/User.php

@@ -15,8 +15,8 @@ class User extends BaseModel
      *
      * @var array
      */
-    protected $guarded = [];
-	protected $hidden = ['password'];
+    protected $guarded = array();
+	protected $hidden = array('password','pay_password');
 	/**
      * 获取关联到用户的角色
      */
@@ -118,14 +118,62 @@ class User extends BaseModel
         return true;
     }
     
+    //获取一条用户信息
+	public static function getOneUser($where)
+    {
+        $user = self::where($where)->first();
+        if(!$user){return false;}
+        $user['reciever_address'] = UserAddress::getOne($user->address_id);
+        
+		return $user;
+    }
+    
     //获取用户信息
 	public static function getUserInfo($user_id)
     {
         $user = self::where('id', $user_id)->first();
         if(!$user){return false;}
-        $user['reciever_address'] = UserAddress::getOne($user->address_id);
-        $user['collect_goods_count'] = CollectGoods::where('user_id', $user_id)->count();
+        $user->reciever_address = UserAddress::getOne($user->address_id);
+        $user->collect_goods_count = CollectGoods::where('user_id', $user_id)->count();
         
 		return $user;
     }
+    
+    //注册
+    public static function wxRegister(array $param)
+	{
+        extract($param); //参数
+        
+        if(isset($user_name)){$data['user_name'] = $user_name;}
+        if(isset($mobile)){$data['mobile'] = $mobile;}
+        if(isset($password)){$data['password'] = $password;}
+        
+        if (isset($data) && $id = self::add($data))
+        {
+            //生成token
+			return Token::getToken(Token::TYPE_WEIXIN, $id);
+        }
+
+        return false;
+    }
+    
+    //用户登录
+	public static function wxLogin(array $param)
+    {
+        extract($param); //参数
+        
+        $user = self::where(array('mobile'=>$user_name,'password'=>$password))->orWhere(array('user_name'=>$user_name,'password'=>$password))->first();
+        
+        if(!$user){return false;}
+        
+        $res = self::getUserInfo($user->id);
+        $token = Token::getToken(Token::TYPE_WEIXIN, $user->id);
+        
+        foreach($token as $k=>$v)
+        {
+            $res->$k = $v;
+        }
+        
+		return $res;
+    }
 }

public/js/md5.min.js

@@ -0,0 +1,2 @@
+!function(n){"use strict";function t(n,t){var r=(65535&n)+(65535&t);return(n>>16)+(t>>16)+(r>>16)<<16|65535&r}function r(n,t){return n<<t|n>>>32-t}function e(n,e,o,u,c,f){return t(r(t(t(e,n),t(u,f)),c),o)}function o(n,t,r,o,u,c,f){return e(t&r|~t&o,n,t,u,c,f)}function u(n,t,r,o,u,c,f){return e(t&o|r&~o,n,t,u,c,f)}function c(n,t,r,o,u,c,f){return e(t^r^o,n,t,u,c,f)}function f(n,t,r,o,u,c,f){return e(r^(t|~o),n,t,u,c,f)}function i(n,r){n[r>>5]|=128<<r%32,n[14+(r+64>>>9<<4)]=r;var e,i,a,d,h,l=1732584193,g=-271733879,v=-1732584194,m=271733878;for(e=0;e<n.length;e+=16)i=l,a=g,d=v,h=m,g=f(g=f(g=f(g=f(g=c(g=c(g=c(g=c(g=u(g=u(g=u(g=u(g=o(g=o(g=o(g=o(g,v=o(v,m=o(m,l=o(l,g,v,m,n[e],7,-680876936),g,v,n[e+1],12,-389564586),l,g,n[e+2],17,606105819),m,l,n[e+3],22,-1044525330),v=o(v,m=o(m,l=o(l,g,v,m,n[e+4],7,-176418897),g,v,n[e+5],12,1200080426),l,g,n[e+6],17,-1473231341),m,l,n[e+7],22,-45705983),v=o(v,m=o(m,l=o(l,g,v,m,n[e+8],7,1770035416),g,v,n[e+9],12,-1958414417),l,g,n[e+10],17,-42063),m,l,n[e+11],22,-1990404162),v=o(v,m=o(m,l=o(l,g,v,m,n[e+12],7,1804603682),g,v,n[e+13],12,-40341101),l,g,n[e+14],17,-1502002290),m,l,n[e+15],22,1236535329),v=u(v,m=u(m,l=u(l,g,v,m,n[e+1],5,-165796510),g,v,n[e+6],9,-1069501632),l,g,n[e+11],14,643717713),m,l,n[e],20,-373897302),v=u(v,m=u(m,l=u(l,g,v,m,n[e+5],5,-701558691),g,v,n[e+10],9,38016083),l,g,n[e+15],14,-660478335),m,l,n[e+4],20,-405537848),v=u(v,m=u(m,l=u(l,g,v,m,n[e+9],5,568446438),g,v,n[e+14],9,-1019803690),l,g,n[e+3],14,-187363961),m,l,n[e+8],20,1163531501),v=u(v,m=u(m,l=u(l,g,v,m,n[e+13],5,-1444681467),g,v,n[e+2],9,-51403784),l,g,n[e+7],14,1735328473),m,l,n[e+12],20,-1926607734),v=c(v,m=c(m,l=c(l,g,v,m,n[e+5],4,-378558),g,v,n[e+8],11,-2022574463),l,g,n[e+11],16,1839030562),m,l,n[e+14],23,-35309556),v=c(v,m=c(m,l=c(l,g,v,m,n[e+1],4,-1530992060),g,v,n[e+4],11,1272893353),l,g,n[e+7],16,-155497632),m,l,n[e+10],23,-1094730640),v=c(v,m=c(m,l=c(l,g,v,m,n[e+13],4,681279174),g,v,n[e],11,-358537222),l,g,n[e+3],16,-722521979),m,l,n[e+6],23,76029189),v=c(v,m=c(m,l=c(l,g,v,m,n[e+9],4,-640364487),g,v,n[e+12],11,-421815835),l,g,n[e+15],16,530742520),m,l,n[e+2],23,-995338651),v=f(v,m=f(m,l=f(l,g,v,m,n[e],6,-198630844),g,v,n[e+7],10,1126891415),l,g,n[e+14],15,-1416354905),m,l,n[e+5],21,-57434055),v=f(v,m=f(m,l=f(l,g,v,m,n[e+12],6,1700485571),g,v,n[e+3],10,-1894986606),l,g,n[e+10],15,-1051523),m,l,n[e+1],21,-2054922799),v=f(v,m=f(m,l=f(l,g,v,m,n[e+8],6,1873313359),g,v,n[e+15],10,-30611744),l,g,n[e+6],15,-1560198380),m,l,n[e+13],21,1309151649),v=f(v,m=f(m,l=f(l,g,v,m,n[e+4],6,-145523070),g,v,n[e+11],10,-1120210379),l,g,n[e+2],15,718787259),m,l,n[e+9],21,-343485551),l=t(l,i),g=t(g,a),v=t(v,d),m=t(m,h);return[l,g,v,m]}function a(n){var t,r="",e=32*n.length;for(t=0;t<e;t+=8)r+=String.fromCharCode(n[t>>5]>>>t%32&255);return r}function d(n){var t,r=[];for(r[(n.length>>2)-1]=void 0,t=0;t<r.length;t+=1)r[t]=0;var e=8*n.length;for(t=0;t<e;t+=8)r[t>>5]|=(255&n.charCodeAt(t/8))<<t%32;return r}function h(n){return a(i(d(n),8*n.length))}function l(n,t){var r,e,o=d(n),u=[],c=[];for(u[15]=c[15]=void 0,o.length>16&&(o=i(o,8*n.length)),r=0;r<16;r+=1)u[r]=909522486^o[r],c[r]=1549556828^o[r];return e=i(u.concat(d(t)),512+8*t.length),a(i(c.concat(e),640))}function g(n){var t,r,e="";for(r=0;r<n.length;r+=1)t=n.charCodeAt(r),e+="0123456789abcdef".charAt(t>>>4&15)+"0123456789abcdef".charAt(15&t);return e}function v(n){return unescape(encodeURIComponent(n))}function m(n){return h(v(n))}function p(n){return g(m(n))}function s(n,t){return l(v(n),v(t))}function C(n,t){return g(s(n,t))}function A(n,t,r){return t?r?s(t,n):C(t,n):r?m(n):p(n)}"function"==typeof define&&define.amd?define(function(){return A}):"object"==typeof module&&module.exports?module.exports=A:n.md5=A}(this);
+//# sourceMappingURL=md5.min.js.map ,https://cdn.bootcss.com/blueimp-md5/2.10.0/js/md5.min.js

resources/views/weixin/user/login.blade.php

@@ -27,31 +27,36 @@
 .adr_add{margin:0 10px;}
 .adr-form-group{margin-top:10px;}
 .adr-form-group input[type=text],.adr-form-group input[type=password]{display:block;width:100%;font-size:16px;padding:12px;color:#777;vertical-align:middle;background-color:#fff;background-image:none;border:1px solid #ddd;border-radius:0;box-sizing:border-box;}
+
+.reg a{color:#2393df;}
 </style>
 <div class="floor account">
     <div class="icon"><i class="fa fa-user-circle" aria-hidden="true"></i></div>
     <br>
-    
+    <form id="login" action="" method="post">
     <div class="adr_add">
         <div class="adr-form-group">
-            <input type="text" name="username" class="" id="username" placeholder="请输入账号">
+            <input type="text" name="user_name" class="" id="user_name" placeholder="请输入账号">
         </div>
         <div class="adr-form-group">
             <input type="password" name="password" class="" id="password" placeholder="请输入密码">
         </div>
     </div>
-    
+    </form>
     <a style="margin:10px;background-color:#1aad19;text-align:center;color:white;border:1px solid #179e16;" class="bottoma" href="javascript:submit();">登录</a>
 </div>
-
+<div class="box reg">
+<a style="float:left;" href="<?php echo route('weixin_register'); ?>">快速注册</a> <a style="float:right;" href="">忘记密码</a>
+</div>
+<script type="text/javascript" src="<?php echo env('APP_URL'); ?>/js/md5.min.js"></script>
 <script type="text/javascript" src="<?php echo env('APP_URL'); ?>/js/layer/mobile/layer.js"></script>
 <script>
 function submit()
 {
-    var username = $("#username").val();
+    var user_name = $("#user_name").val();
     var password = $("#password").val();
     
-    if(username == '')
+    if(user_name == '')
     {
         //提示
         layer.open({
@@ -75,24 +80,25 @@ function submit()
         return false;
     }
     
-    $.post(url,{name:name,mobile:mobile,address:address,province:province,city:city,district:district,is_default:is_default},function(res)
+    $("#login").submit();
+    /* $.post('<?php echo env('APP_API_URL').'/wx_login'; ?>',{user_name:user_name,password:md5(password)},function(res)
 	{
 		if(res.code==0)
 		{
             //提示
             layer.open({
-                content: res.msg
+                content: '登录成功'
                 ,skin: 'msg'
                 ,time: 2 //2秒后自动关闭
             });
             
-            window.history.back();
+            location.href = '<?php if(isset($_SERVER["HTTP_REFERER"])){echo $_SERVER["HTTP_REFERER"];}else{echo route('weixin_user');} ?>';
 		}
 		else
 		{
             
 		}
-	},'json');
+	},'json'); */
 }
 </script>
 @include('weixin.common.footer')

resources/views/weixin/user/register.blade.php

@@ -0,0 +1,150 @@
+<!DOCTYPE html><html><head><meta http-equiv="content-type" content="text/html;charset=utf-8"/>
+<title>注册</title><meta name="keywords" content="关键词"><meta name="description" content="描述"><meta content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0" name="viewport">
+<link href="<?php echo env('APP_URL'); ?>/css/weixin/style.css" type="text/css" rel="stylesheet">
+<script type="text/javascript" src="<?php echo env('APP_URL'); ?>/js/jquery.min.js"></script>
+<script type="text/javascript" src="<?php echo env('APP_URL'); ?>/js/weixin/mobile.js"></script>
+<link href="<?php echo env('APP_URL'); ?>/css/font-awesome.min.css" type="text/css" rel="stylesheet"></head><body>
+<div class="classreturn loginsignup">
+    <div class="ds-in-bl return"><a href="javascript:history.back(-1);"><img src="<?php echo env('APP_URL'); ?>/images/weixin/return.png" alt="返回"></a></div>
+    <div class="ds-in-bl tit center"><span>注册</span></div>
+    <div class="ds-in-bl nav_menu"><a href="javascript:void(0);"><img src="<?php echo env('APP_URL'); ?>/images/weixin/class1.png" alt="菜单"></a></div>
+</div>
+<div class="flool tpnavf cl">
+    <div class="nav_list">
+        <ul>
+        <a href="index.html"><li><img src="<?php echo env('APP_URL'); ?>/images/weixin/home_icon.png"><p>首页</p></li></a>
+        <a href="/Weixin/index.php?m=Store&amp;a=index"><li><img src="<?php echo env('APP_URL'); ?>/images/weixin/brand_icon.png"><p>分类</p></li></a>	
+        <a href="/Weixin/index.php?m=Cart&amp;a=index"><li><img src="<?php echo env('APP_URL'); ?>/images/weixin/car_icon.png"><p>购物车</p></li></a>	
+        <a href="/Weixin/index.php?m=User&amp;a=index"><li><img src="<?php echo env('APP_URL'); ?>/images/weixin/center_icon.png"><p>个人中心</p></li></a></ul>
+        <div class="cl"></div>
+    </div>
+</div>
+<style>
+.account{text-align:center;margin-top:50px;}
+.account .icon{color:#FFCC00;font-size:100px;}
+.bottoma{display:block;font-size:18px;padding:10px;border-radius:2px;}
+
+.adr_add{margin:0 10px;}
+.adr-form-group{margin-top:10px;}
+.adr-form-group input[type=text],.adr-form-group input[type=password]{display:block;width:100%;font-size:16px;padding:12px;color:#777;vertical-align:middle;background-color:#fff;background-image:none;border:1px solid #ddd;border-radius:0;box-sizing:border-box;}
+
+.reg a{color:#2393df;}
+</style>
+<div class="floor account">
+    <div class="icon"><i class="fa fa-user-circle" aria-hidden="true"></i></div>
+    <br>
+    <form id="login" action="" method="post">
+    <div class="adr_add">
+        <div class="adr-form-group">
+            <input type="text" name="user_name" class="" id="user_name" placeholder="请输入用户名">
+        </div>
+        <div class="adr-form-group">
+            <input type="text" name="mobile" class="" id="mobile" placeholder="请输入手机号码">
+        </div>
+        <div class="adr-form-group">
+            <input type="password" name="password" class="" id="password" placeholder="请输入密码">
+        </div>
+        <div class="adr-form-group">
+            <input type="password" name="re_password" class="" id="re_password" placeholder="确认密码">
+        </div>
+    </div>
+    </form>
+    <a style="margin:10px;background-color:#1aad19;text-align:center;color:white;border:1px solid #179e16;" class="bottoma" href="javascript:submit();">提交</a>
+</div>
+<div class="box reg">
+<a style="float:left;" href="<?php echo route('weixin_login'); ?>">已有账号</a>
+</div>
+
+<script type="text/javascript" src="<?php echo env('APP_URL'); ?>/js/md5.min.js"></script>
+<script type="text/javascript" src="<?php echo env('APP_URL'); ?>/js/layer/mobile/layer.js"></script>
+<script>
+function submit()
+{
+    var user_name = $("#user_name").val();
+    var mobile = $("#mobile").val();
+    var password = $("#password").val();
+    var re_password = $("#re_password").val();
+    
+    if(user_name == '')
+    {
+        //提示
+        layer.open({
+            content: '用户名不能为空'
+            ,skin: 'msg'
+            ,time: 2 //2秒后自动关闭
+        });
+        
+        return false;
+    }
+    
+    if(mobile == '')
+    {
+        //提示
+        layer.open({
+            content: '手机号不能为空'
+            ,skin: 'msg'
+            ,time: 2 //2秒后自动关闭
+        });
+        
+        return false;
+    }
+    
+    if(!validatemobile(mobile))
+    {
+        //提示
+        layer.open({
+            content: '手机号格式不正确'
+            ,skin: 'msg'
+            ,time: 2 //2秒后自动关闭
+        });
+        
+        return false;
+    }
+    
+    if(password == '')
+    {
+        //提示
+        layer.open({
+            content: '密码不能为空'
+            ,skin: 'msg'
+            ,time: 2 //2秒后自动关闭
+        });
+        
+        return false;
+    }
+    
+    if(password != re_password)
+    {
+        //提示
+        layer.open({
+            content: '两次密码不一致'
+            ,skin: 'msg'
+            ,time: 2 //2秒后自动关闭
+        });
+        
+        return false;
+    }
+    
+    $("#login").submit();
+    /* $.post('<?php echo env('APP_API_URL').'/wx_login'; ?>',{user_name:user_name,password:md5(password)},function(res)
+	{
+		if(res.code==0)
+		{
+            //提示
+            layer.open({
+                content: '登录成功'
+                ,skin: 'msg'
+                ,time: 2 //2秒后自动关闭
+            });
+            
+            location.href = '<?php if(isset($_SERVER["HTTP_REFERER"])){echo $_SERVER["HTTP_REFERER"];}else{echo route('weixin_user');} ?>';
+		}
+		else
+		{
+            
+		}
+	},'json'); */
+}
+</script>
+@include('weixin.common.footer')
+</body></html>

routes/web.php

@@ -64,7 +64,8 @@ Route::group(['prefix' => 'weixin', 'namespace' => 'Weixin'], function () {
 	Route::get('/goods/{id}', 'GoodsController@goods')->name('weixin_goods_detail'); //商品详情页
 	Route::get('/goodslist', 'GoodsController@goodslist')->name('weixin_goods_list'); //产品分类页
     
-    Route::get('/login', 'UserController@login')->name('weixin_login');
+    Route::any('/login', 'UserController@login')->name('weixin_login');
+    Route::any('/register', 'UserController@register')->name('weixin_register');
     Route::get('/logout', 'UserController@logout')->name('weixin_user_logout'); //退出
     //页面跳转
 	Route::get('/jump', 'IndexController@jump')->name('weixin_jump');
@@ -119,6 +120,9 @@ Route::group(['prefix' => 'dataapi', 'namespace' => 'Api', 'middleware' => ['web
     //地区，省市区
 	Route::get('/region_list', 'RegionController@regionList');
     Route::get('/region_detail', 'RegionController@regionDetail');
+    //用户
+	Route::post('/wx_register', 'UserController@wxRegister'); //注册
+    Route::post('/wx_login', 'UserController@wxLogin'); //登录
 });
 
 //API接口路由，需token验证
@@ -171,7 +175,7 @@ Route::group(['prefix' => 'dataapi', 'namespace' => 'Api', 'middleware' => ['web
     Route::post('/feedback_add', 'FeedBackController@feedbackAdd');
     
     //其它
-    Route::get('/verifycode_check', 'VerifyCodeController@check'); //验证码校验
+    Route::get('/verifycode_check', 'VerifyCodeController@verifyCodeCheck'); //验证码校验
     Route::get('/andriod_upgrade', 'IndexController@andriodUpgrade'); //安卓升级
     //图片上传
     Route::post('/image_upload', 'ImageController@imageUpload'); //普通文件/图片上传