소스 검색

no commit message

齐博 6 년 전
부모
커밋
77713d02c9

+ 1 - 1
application/admin/controller/Member.php

@@ -52,7 +52,7 @@ class Member extends AdminBase
 	    if(empty($id)) $this->error('缺少参数');	    
     	if (IS_POST) {    	    
     	    $data = get_post('post');    	    
-    	    if($data['groupid']==3&&$this->user['groupid']!=3){
+    	    if(!defined('SUPER_ADMIN')&&$data['groupid']==3&&$this->user['groupid']!=3){
     	        $this->error('你无权修改超管资料!');
     	    }
     	    // 验证

+ 138 - 0
application/index/controller/Getpassword.php

@@ -0,0 +1,138 @@
+<?php
+namespace app\index\controller;
+
+use app\common\model\User AS UserModel;
+use app\common\controller\IndexBase;
+use think\Controller;
+
+class Getpassword extends IndexBase
+{
+    /**
+     * 获取邮箱或手机注册码
+     * @param string $type
+     */
+    public function getnum($type='',$to=''){
+        //邮箱注册码与手机注册码,不建议同时启用,所以这里没分开处理
+        if( time()-get_cookie('send_num') <120 ){
+            return $this->err_js('2分钟后,才能再次获取验证码!');
+        }
+        $num = cache(get_cookie('user_sid').'_reg') ?: rand(1000,9999);
+        $send_num = get_md5_num($to.$num,6);
+        $title = '来自《'.config('webdb.webname').'》的验证码,请注册查收';
+        $content = '你的验证码是:'.$send_num;
+        cache(get_cookie('user_sid').'_reg',$num,600);
+        if($type=='mobphone'){
+            $result = send_sms($to,$send_num);
+        }elseif($type=='email'){
+            if( UserModel::get_info($to,'email') ){
+                $result = send_mail($to,$title,$content);                
+            }else{
+                $result = '当前邮箱不存在!';
+            }
+        }else{
+            $result = '请选择类型!';
+        }        
+        if($result===true){
+            set_cookie('send_num', time());
+            return $this->ok_js();
+        }else{
+            return $this->err_js($result.$send_num);
+        }
+    }
+    
+    /**
+     * 核对手机或邮箱注册码
+     * @param string $num
+     * @return void|\think\response\Json
+     */
+    public function check_num($num='',$field=''){
+        //邮箱注册码与手机注册码,不建议同时启用,所以这里没分开处理
+        $_num = cache(get_cookie('user_sid').'_reg');
+        $send_num = get_md5_num($field.$_num,6);
+        if( $num ==  $send_num){
+            return $this->ok_js();
+        }
+        return $this->err_js('验证码不正确');
+    }
+    
+    /**
+     * 校验用户名与密码
+     */
+    public function check($username='',$password='',$captcha=''){
+        if($username!=''){
+            $info = UserModel::get_info($username,'username');
+            if($info){
+                return $this->ok_js($info);
+            }else{
+                return $this->err_js('用户不存在!');
+            }
+        }else{
+            $data = get_post('get');
+            if(isset($data['captcha'])&&$data['captcha']==''){
+                $data['captcha'] = 'test';
+            }
+            foreach($data AS $key=>$value){
+                $name = $key;
+                break;
+            }
+            $result = $this->validate($data, 'Reg.'.$name);
+            if( $result!==true ){
+                return $this->err_js($result);
+            }else{
+                return $this->ok_js();
+            }            
+        }		
+    }
+    
+    /**
+     * 取回密码
+     * @return mixed|string
+     */
+    public function index()
+    {
+        if ($this->user) {
+            $this->error('你已经登录了!');
+        }
+        
+        $data = get_post('post');
+        
+        hook_listen('getpassword_begin',$data);
+        
+        if(IS_POST){
+            $info = UserModel::get_info($data['username'],'username');
+            if(!$info){
+                $this->error('帐号不存在');
+            }
+            
+            if($data['captcha']==''){
+                $data['captcha'] = 'test';
+            }
+            $result = $this->validate($data, 'Reg.captcha');
+            if(true !== $result) $this->error($result);
+            
+            //邮箱注册码与手机注册码,这里只判断只中一种
+            $num = cache(get_cookie('user_sid').'_reg');
+            $send_num = get_md5_num((($this->webdb['getpassword_by_phone']&&$info['mobphone'])?$info['mobphone']:$info['email']).$num,6);
+            if( ($data['email_code']!=$send_num&&$data['phone_code']!=$send_num) || empty($num)) {
+                $this->error('验证码不对');
+            }
+            cache(get_cookie('user_sid').'_reg',null);
+
+            $array = [
+                    'uid'=>$info['uid'],
+                    'password'=>$data['password'],
+            ];
+            
+            $result = UserModel::edit_user($array); 
+            
+            hook_listen('getpassword_end',$info,$data);
+            
+            if($result){
+                $this->success('密码设置成功','index/index');
+            }else{
+                $this->error('密码设置失败!');
+            }
+        }
+		return $this->fetch();
+    }
+}

+ 5 - 5
extend/email/PHPMailer.php

@@ -453,7 +453,7 @@ class PHPMailer {
    */
   private function AddAnAddress($kind, $address, $name = '') {
     if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
-      echo 'Invalid recipient array: ' . kind;
+      //echo 'Invalid recipient array: ' . kind;
       return false;
     }
     $address = trim($address);
@@ -463,7 +463,7 @@ class PHPMailer {
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
-      echo $this->Lang('invalid_address').': '.$address;
+      //echo $this->Lang('invalid_address').': '.$address;
       return false;
     }
     if ($kind != 'ReplyTo') {
@@ -495,7 +495,7 @@ class PHPMailer {
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
-      echo $this->Lang('invalid_address').': '.$address;
+      //echo $this->Lang('invalid_address').': '.$address;
       return false;
     }
     $this->From = $address;
@@ -585,7 +585,7 @@ class PHPMailer {
       if ($this->exceptions) {
         throw $e;
       }
-      echo $e->getMessage()."\n";
+      //echo $e->getMessage()."\n";
       return false;
     }
   }
@@ -1369,7 +1369,7 @@ class PHPMailer {
       if ($this->exceptions) {
         throw $e;
       }
-      echo $e->getMessage()."\n";
+      //echo $e->getMessage()."\n";
       if ( $e->getCode() == self::STOP_CRITICAL ) {
         return false;
       }

+ 338 - 0
template/index_style/default/index/getpassword/index.htm

@@ -0,0 +1,338 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<title>取回密码</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" href="__STATIC__/css/base.css">
+	<link rel="stylesheet" href="__STATIC__/icon/icon.css">
+	<script type="text/javascript" src="__STATIC__/js/core/jquery.min.js"></script>
+	<script type="text/javascript" src="__STATIC__/layer/layer.js"></script>
+</head>
+<body>
+<style>
+header{
+	background:#E94726;
+	color:#FFF;
+	margin-bottom:50px;
+}
+header ul{
+	display:table;
+	width:100%;
+	height:50px;	
+}
+header ul ol,header ul li{
+	display:table-cell;
+	vertical-align:middle;
+	text-align:center;
+}
+header ul ol{
+	width:40px;
+}
+.LogoContainer{
+	max-width:640px;
+	margin:auto;
+	position:relative;
+}
+.LogoContainer:before{
+	content:'';
+	display:block;
+	padding-top:60%;
+}
+.LogoContainer ul{
+	width:30%;
+	position:absolute;
+	left:50%;
+	top: 50%;
+  -webkit-transform: translate3D(-50%, -50%, 0);
+      -ms-transform: translate3D(-50%, -50%, 0);
+          transform: translate3D(-50%, -50%, 0);
+}
+.LogoContainer ul ol img{
+	width:100%;
+}
+.LogoContainer ul li{
+	text-align:center;
+	padding-top:5%;
+	color:#D43B1B;
+}
+.FormContainer{
+	padding:0 20px;
+}
+.FormContainer ul{
+	display:table;
+	width:100%;
+	border-bottom:#DDD solid 1px;
+}
+.FormContainer ul ol,.FormContainer ul li{
+	display:table-cell;
+	vertical-align:middle;
+	height:40px;	
+}
+.FormContainer ul ol{
+	width:30px;
+	font-size:20px;
+}
+.FormContainer ul li input{
+	width:99%;
+	border:0;
+	text-indent:5px;
+	outline:none;
+	background:none;
+}
+.FormContainer ul li input.error{
+	border:#F30 solid 1px;
+	border-radius:5px;
+}
+.FormContainer dl{
+	display:table;
+	width:100%;
+	margin-top:20px;
+}
+.FormContainer dl dt,.FormContainer dl dd{
+	display:table-cell;
+	vertical-align:middle;
+	height:30px;
+	width:50%;
+}
+.FormContainer dl dd{
+	text-align:right;
+}
+.OtherLogin .h{
+	line-height:30px;
+	margin-top:30px;
+	position:relative;
+	color:#888;
+	text-align:center;
+}
+.OtherLogin .h:before{
+	content:'';
+	display:block;
+	position:absolute;
+	width:100%;
+	height:1px;
+	background:#DDD;
+	left:0;
+	top:14px;
+}
+.OtherLogin .h span{
+	display:inline-block;
+	position:relative;
+	background:#FFF;
+	padding:0 20px;
+}
+.OtherLogin .c{
+	text-align:center;
+	padding:15px 0;
+}
+.OtherLogin .c a{
+	display:inline-block;
+	background:#333BDD;
+	padding:8px;
+	margin:0 20px;
+	color:#FFF;
+	font-size:20px;
+	border-radius:5px;
+}
+.OtherLogin .c a.wx{
+	background:#41BD16;
+}	
+@media (max-width: 2000px) and (min-width:601px) {
+	header ul{
+		height:70px;
+		font-size:24px;	
+	}	
+}
+@media (max-width: 600px) and (min-width:501px) { 
+	header ul{
+		height:60px;
+		font-size:20px;	
+	}	
+}
+@media (max-width: 500px) and (min-width:401px) { 
+	header ul{
+		height:55px;
+		font-size:18px;	
+	}
+}
+@media (max-width: 400px) {
+	header ul{
+		height:50px;
+		font-size:16px;	
+	}
+}
+.butterBox{
+	text-align:center;
+	padding:20px 0;
+	word-spacing:20px;
+}
+.mui-btn{
+	font-size: 14px;
+	font-weight: 400;
+	line-height: 1.42;
+	position: relative;
+	display: inline-block;
+	margin-bottom: 0;
+	padding: 6px 12px;
+	cursor: pointer;
+	-webkit-transition: all;
+	transition: all;
+	-webkit-transition-timing-function: linear;
+	transition-timing-function: linear;
+	-webkit-transition-duration: .2s;
+	transition-duration: .2s;
+	text-align: center;
+	vertical-align: top;
+	white-space: nowrap;
+	color: #333;
+	border: 1px solid #ccc;
+	border-radius: 3px;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px;
+	background-color: #fff;
+	background-clip: padding-box
+}
+.mui-btn-danger{
+	color: #fff;
+	border: 1px solid #dd524d;
+	background-color: #dd524d
+}
+.mui-btn-back{
+	color: #fff;
+	border: 1px solid #999;
+	background-color: #AAA
+}
+</style>
+<header>
+	<ul>
+		<ol><i class="fa fa-angle-left" onclick="window.history.back()"></i></ol>
+		<li>取回密码</li>
+		<ol><br/></ol>
+	</ul>
+</header>
+<div class="FormContainer">
+<form class="mui-input-group" action="{:urls('index')}" method="post">
+	<ul><ol><i class="fa fa-fw fa-user-o"></i></ol><li><input type="text" name="username" minlength="3" maxlength="20" placeholder="请输入帐号" onBlur="check_username($(this),'username')" required/></li></ul>
+ 
+					
+					{eq name="webdb.getpassword_by_phone" value="1"}
+					<!--这里最好是做个单选按钮给用户选择手机还是邮箱获取验证码-->
+					<ul class="getyznum" style="display:none;">
+						<ol><i class="glyphicon glyphicon-question-sign"></i></ol>
+						<li><input type="text" name="phone_code" placeholder="请点击右边文字获取验证码" onBlur="check_num($(this),'mobphone')" required/></li>
+						<li><a href="#" onclick="get_code_num('mobphone')">获取验证码</a></li>
+					</ul>
+					{else /}
+					<ul class="getyznum" style="display:none;">
+						<ol><i class="glyphicon glyphicon-question-sign"></i></ol>
+						<li><input type="text" name="email_code" placeholder="请点击右边文字获取验证码" onBlur="check_num($(this),'email')" required/></li>
+						<li><a href="#" onclick="get_code_num('email')">获取验证码</a></li>
+					</ul>
+					{/eq}
+					
+
+
+
+					<ul class="getqrcode" style="display:none;">
+						<ol><i class="glyphicon glyphicon-question-sign"></i></ol>
+						<li><input type="text" name="captcha" placeholder="请输入右边验证码" onBlur="checkinput($(this),'captcha')" required/></li>
+						<li><img src="{:captcha_src()}" style="cursor: pointer;" onclick="this.src='{:captcha_src()}?d='+Math.random();" title="点击刷新"/></li>
+					</ul>
+
+						<ul class="setpassword" style="display:none;"><ol><i class="si si-lock"></i></ol><li><input type="password" name="password" minlength="5" maxlength="30" placeholder="请输入密码" onBlur="checkinput($(this),'password')" required/></li></ul>
+
+
+
+	<div class="butterBox">
+		<a href="{:urls('login/index')}"><button type="button" class="mui-btn mui-btn-back">返回登录</button></a>
+		<button type="submit" class="mui-btn mui-btn-danger postform" style="display:none;">重置密码</button>
+	</div>
+
+
+</form>
+<script type="text/javascript">
+
+
+
+function get_code_num(type){
+	var to = type=='email' ? email : mobphone;
+	if(type=='mobphone'){
+		if(to==''){
+			layer.msg('此帐号没有设置手机号码');
+			return false;
+		}
+	}else if(type=='email'){
+		if(to==''){
+			layer.msg('此帐号没有设置邮箱');
+			return false;
+		}
+	}
+	layer.msg('请稍候,系统正在发送验证码!',{time:3000});
+	$.get("{:urls('getnum')}?type="+type+'&to='+ to +'&'+Math.random(),function(res){
+		layer.close();
+		if(res.code==0){
+			layer.alert('验证码已成功发出,请耐心等候,注意查收!');
+		}else{
+			layer.alert(res.msg);
+		}			
+	});
+}
+
+function check_num(objs,type){
+	var vals=objs.val();
+	var field = type=='email' ? email : mobphone;
+	$.get("{:urls('check_num')}?num="+vals+"&type="+type+'&field='+field+'&'+Math.random(),function(res){
+		if(res.code==0){
+			$('.getqrcode').show();
+			//$('.postform').show();
+			objs.removeClass('error');
+		}else{
+			layer.msg(res.msg);
+			objs.addClass('error');
+		}			
+	});
+}
+
+var email = '';
+var mobphone = '';
+function check_username(objs,type){
+	var vals=objs.val();
+	$.get("{:urls('check')}?"+type+"="+vals+'&'+Math.random(),function(res){
+		if(res.code==0){
+			email = res.data.email;
+			mobphone = res.data.mobphone;
+			$('.getyznum').show();
+			objs.removeClass('error');
+		}else{
+			layer.msg(res.msg);
+			//objs.focus();
+			objs.addClass('error');
+		}			
+	});
+}
+
+function checkinput(objs,type){
+	var vals=objs.val();
+	$.get("{:urls('check')}?"+type+"="+vals+'&'+Math.random(),function(res){
+		if(res.code==0){
+			if(type=='captcha'){
+				$('.setpassword').show();
+				$('.postform').show();
+			}
+			objs.removeClass('error');
+		}else{
+			layer.msg(res.msg);
+			//objs.focus();
+			objs.addClass('error');
+		}			
+	});
+}
+
+</script>
+</div>
+</body>
+</html>

+ 153 - 0
template/index_style/default/index/getpassword/pc_index.htm

@@ -0,0 +1,153 @@
+{extend name="$index_style_layout" /}
+{block name="head_mui_css"}<!--不使用mui-->{/block}
+{block name="head_title"}用户登录{/block}
+{block name="nav"}
+<div class="qb_ui_Site_nav">
+	<ul>
+		<ol><i class="si si-home"></i>当前位置:</ol>
+		<li>
+			<a href='/' class="home">网站首页</a> <a href='#'>取回密码</a>
+		</li>
+	</ul>
+</div>
+{/block}
+{block name="body_content"}
+<link rel="stylesheet" href="__STATIC__/index/default/pclogin.css"> 
+<div class="UserLoginCont">
+	<div class="head"><i class="fa fa-address-book-o"></i> 取回密码</div>
+	<div class="LoginCont">
+		<div class="Left">
+			<form class="mui-input-group" action="{:urls('index')}" method="post">
+				<div class="LoginBox">
+					<ul>
+						<li class="icon"><i class="fa fa-fw fa-user-o"></i></li>
+						<ol><input type="text" name="username" minlength="3" maxlength="20" placeholder="请输入帐号" onBlur="check_username($(this),'username')" required/></ol>
+						<li>请输入帐号</li>
+					</ul>
+					
+					{eq name="webdb.getpassword_by_phone" value="1"}
+					<!--这里最好是做个单选按钮给用户选择手机还是邮箱获取验证码-->
+					<ul class="getyznum" style="display:none;">
+						<li class="icon"><i class="glyphicon glyphicon-question-sign"></i></li>
+						<ol><input type="text" name="phone_code" placeholder="请点击右边文字获取验证码" onBlur="check_num($(this),'mobphone')" required/></ol>
+						<li><a href="#" onclick="get_code_num('mobphone')">获取验证码</a></li>
+					</ul>
+					{else /}
+					<ul class="getyznum" style="display:none;">
+						<li class="icon"><i class="glyphicon glyphicon-question-sign"></i></li>
+						<ol><input type="text" name="email_code" placeholder="请点击右边文字获取验证码" onBlur="check_num($(this),'email')" required/></ol>
+						<li><a href="#" onclick="get_code_num('email')">获取验证码</a></li>
+					</ul>
+					{/eq}
+					
+					
+					<ul class="getqrcode" style="display:none;">
+						<li class="icon"><i class="glyphicon glyphicon-question-sign"></i></li>
+						<ol><input type="text" name="captcha" placeholder="请输入右边验证码" onBlur="checkinput($(this),'captcha')" required/></ol>
+						<li><img src="{:captcha_src()}" style="cursor: pointer;" onclick="this.src='{:captcha_src()}?d='+Math.random();" title="点击刷新"/></li>
+					</ul>
+
+					<ul class="setpassword" style="display:none;">
+						<li class="icon"><i class="si si-lock"></i></li>
+						<ol><input type="password" class='password1' name="password" minlength="5" maxlength="30" placeholder="请输入新密码" onBlur="checkinput($(this),'password')" required/></ol>
+						<li>请输入新密码</li>
+					</ul>
+
+					<div class="butter postform" style="display:none;"><button type="submit">重置密码</button></div>
+				</div>
+</form>
+<script type="text/javascript">
+
+
+
+function get_code_num(type){
+	var to = type=='email' ? email : mobphone;
+	if(type=='mobphone'){
+		if(to==''){
+			layer.msg('此帐号没有设置手机号码');
+			return false;
+		}
+	}else if(type=='email'){
+		if(to==''){
+			layer.msg('此帐号没有设置邮箱');
+			return false;
+		}
+	}
+	layer.msg('请稍候,系统正在发送验证码!',{time:3000});
+	$.get("{:urls('getnum')}?type="+type+'&to='+ to +'&'+Math.random(),function(res){
+		layer.close();
+		if(res.code==0){
+			layer.alert('验证码已成功发出,请耐心等候,注意查收!');
+		}else{
+			layer.alert(res.msg);
+		}			
+	});
+}
+
+function check_num(objs,type){
+	var vals=objs.val();
+	var field = type=='email' ? email : mobphone;
+	$.get("{:urls('check_num')}?num="+vals+"&type="+type+'&field='+field+'&'+Math.random(),function(res){
+		if(res.code==0){
+			$('.getqrcode').show();
+			//$('.postform').show();
+			objs.removeClass('error');
+		}else{
+			layer.msg(res.msg);
+			objs.addClass('error');
+		}			
+	});
+}
+
+var email = '';
+var mobphone = '';
+function check_username(objs,type){
+	var vals=objs.val();
+	$.get("{:urls('check')}?"+type+"="+vals+'&'+Math.random(),function(res){
+		if(res.code==0){
+			email = res.data.email;
+			mobphone = res.data.mobphone;
+			$('.getyznum').show();
+			objs.removeClass('error');
+		}else{
+			layer.msg(res.msg);
+			//objs.focus();
+			objs.addClass('error');
+		}			
+	});
+}
+
+function checkinput(objs,type){
+	var vals=objs.val();
+	$.get("{:urls('check')}?"+type+"="+vals+'&'+Math.random(),function(res){
+		if(res.code==0){
+			if(type=='captcha'){
+				$('.setpassword').show();
+				$('.postform').show();
+			}
+			objs.removeClass('error');
+		}else{
+			layer.msg(res.msg);
+			//objs.focus();
+			objs.addClass('error');
+		}			
+	});
+}
+
+</script>
+		</div>
+		<div class="Right">
+			<h3>更换其它帐号?点击登录</h3>
+			<!--<p>你也可以用微信扫描下面二维码自动注册或自动登录</p>-->
+			<dl>
+				<dt><a href="{:urls('login/index')}">点击登录</a></dt>
+				 
+			</dl>
+		</div>
+	</div>
+</div>
+
+ 
+
+
+{/block}

+ 1 - 1
template/index_style/default/index/login/index.htm

@@ -209,7 +209,7 @@
 	<input type="hidden" name="fromurl" value="{$fromurl}">
 	<button type="submit" class="mui-btn mui-btn-danger mui-btn-block">登录</button>
 	<dl>
-		<dt><a href="{:urls('login/index')}?job=getpass">忘记密码</a></dt>
+		<dt><a href="{:urls('getpassword/index')}">忘记密码</a></dt>
 		<dd><a href="{:urls('reg/index')}">注册帐号</a></dd>
 	</dl>
 	<div class="OtherLogin">

+ 1 - 1
template/index_style/default/index/login/pc_index.htm

@@ -32,7 +32,7 @@
 						<ol>
 							<input type="password" name="password" minlength="3" maxlength="30" placeholder="请输入密码" required/>
 						</ol>
-						<li><a href="{:urls('login/index')}?job=getpass">忘记密码</a></li>						
+						<li><a href="{:urls('getpassword/index')}">忘记密码</a></li>						
 					</ul>
 					<div class="butter"><input type="hidden" name="fromurl" value="{$fromurl}"><button type="submit">登录</button></div>
 				</div>

+ 2 - 2
template/index_style/default/index/reg/index.htm

@@ -217,8 +217,8 @@ header ul ol{
 <div class="FormContainer">
 <form class="mui-input-group" action="{:urls('reg/index')}" method="post">
 	<ul><ol><i class="fa fa-fw fa-user-o"></i></ol><li><input type="text" name="username" minlength="3" maxlength="20" placeholder="请输入帐号" onBlur="checkinput($(this),'username')" required/></li></ul>
-	<ul><ol><i class="si si-lock"></i></ol><li><input type="password" name="password" minlength="6" maxlength="30" placeholder="请输入密码" onBlur="checkinput($(this),'password')" required/></li></ul>
-	<ul><ol><i class="si si-lock"></i></ol><li><input type="password" name="password2" minlength="6" maxlength="30" placeholder="请重复输入密码" onBlur="checkpassword($(this))" required/></li></ul>
+	<ul><ol><i class="si si-lock"></i></ol><li><input type="password" name="password" minlength="5" maxlength="30" placeholder="请输入密码" onBlur="checkinput($(this),'password')" required/></li></ul>
+	<ul><ol><i class="si si-lock"></i></ol><li><input type="password" name="password2" minlength="5" maxlength="30" placeholder="请重复输入密码" onBlur="checkpassword($(this))" required/></li></ul>
 	<ul><ol><i class="fa fa-envelope"></i></ol><li><input type="text" name="email" placeholder="可留空" onBlur="checkinput($(this),'email')" required/></li></ul>
 	<!--
 	<ul><ol><i class="fa fa-weixin"></i></ol><li><input type="text" name="weixin_id" placeholder="可留空"/></li></ul>

+ 2 - 2
template/index_style/default/index/reg/pc_index.htm

@@ -26,12 +26,12 @@
 					</ul>
 					<ul>
 						<li class="icon"><i class="si si-lock"></i></li>
-						<ol><input type="password" class='password1' name="password" minlength="6" maxlength="30" placeholder="请输入密码" onBlur="checkinput($(this),'password')" required/></ol>
+						<ol><input type="password" class='password1' name="password" minlength="5" maxlength="30" placeholder="请输入密码" onBlur="checkinput($(this),'password')" required/></ol>
 						<li>6个字符以上</li>
 					</ul>
 					<ul>
 						<li class="icon"><i class="si si-lock"></i></li>
-						<ol><input type="password" name="password2" minlength="6" maxlength="30" placeholder="请重复输入密码" onBlur="checkpassword($(this))" required/></ol>
+						<ol><input type="password" name="password2" minlength="5" maxlength="30" placeholder="请重复输入密码" onBlur="checkpassword($(this))" required/></ol>
 						<li>与密码一致</li>
 					</ul>
 					<ul>